TS Clean-up - Move Classes and Rename Packages #660

michalvavrik · 2022-05-25T21:24:51Z

Summary

As a part of the Test Suite clean up, classes has been moved to a packages named according to io.quarkus.ts.MODULE_NAME.SCENARIO_NAME. Exact rules how to translate MODULE_NAME to java package name has been relaxed in order to make the package names readable. That's compliant with the existing state that either merge module name to one worded package name, or join module names by dots.

Also fixed tests ChuckNorrisResourceIT#endpointShouldTrace and ChuckNorrisResourceIT#httpClientShouldHaveHisOwnSpan as Jagger service vertx-web-client is tracing operating called /trace/ping, however tests were looking for trace/ping operation and thus failed. Similarly, io.quarkus.ts.http.graphql.telemetry.TelemetryIT#verifyTelemetry operation name has been changed to /graphql, which make the test pass.

Keycloak version used in DevModeKeycloakDevServiceUserExperienceIT is upgraded to 18.0. as upstream docs says In Keycloak 17 the default distribution is now powered by Quarkus, while the legacy WildFly powered distribution will still be around until June 2022 we highly recommend starting the migration as soon as possible. and using Keycloak 13.0.1 caused test failures of DevModeKeycloakDevServiceUserExperienceIT.

Please select the relevant options.

Bug fix (non-breaking change which fixes an issue)
Dependency update
New scenario (non-breaking change which adds functionality)
This change requires a documentation update
Refactoring

Checklist:

Methods and classes used in PR scenarios are meaningful
Commits are well encapsulated and follow the best practices

michalvavrik · 2022-05-25T21:28:31Z

cc @jsmrcka

pjgg

Also could you double-check the following modules:

http/jaxrs: io.quarkus.ts.security.core ?
http/http-static: io.quarkus.ts.http -> io.quarkus.ts.http.static
http/reactive-routes: io.quarkus.ts -> io.quarkus.ts.http.reactiveroutes
http/server-undertow: io.quarkus.ts.filters -> io.quarkus.ts.http.undertow.filters (aplies to all packages)
http/vertx-web-client: io.quarkus.qe.vertx -> io.quarkus.ts.http.vertx (applies to all packages)
infinispan-client: io.quarkus.ts.infinispan -> io.quarkus.ts.http.infinispan
...and so on (in general try to add the module name to the packages definition)
io.quarkus.ts.MODULE_NAME.SCENARIO_NAME

websockets/websockets-client/src/test/java/io/quarkus/websockets/client/WebSocketsClientIT.java

...quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerIT.java

michalvavrik · 2022-05-26T10:28:13Z

Also could you double-check the following modules:

http/jaxrs: io.quarkus.ts.security.core ?

http/http-static: io.quarkus.ts.http -> io.quarkus.ts.http.static

http/reactive-routes: io.quarkus.ts -> io.quarkus.ts.http.reactiveroutes

http/server-undertow: io.quarkus.ts.filters -> io.quarkus.ts.http.undertow.filters (aplies to all packages)

http/vertx-web-client: io.quarkus.qe.vertx -> io.quarkus.ts.http.vertx (applies to all packages)

infinispan-client: io.quarkus.ts.infinispan -> io.quarkus.ts.http.infinispan
...and so on (in general try to add the module name to the packages definition)
io.quarkus.ts.MODULE_NAME.SCENARIO_NAME

I didn't get that far as I tried to keep a commit at reasonable length. If though changes are insignificant, it already changes 105 files in some way. Sure, I'll address this in this commit and get back to you, thanks for suggestion

michalvavrik · 2022-05-26T16:44:55Z

http/http-static: io.quarkus.ts.http -> io.quarkus.ts.http.static
That's not a valid java package name.

michalvavrik · 2022-05-26T16:53:31Z

@pjgg I have run a tests before and after every refactoring in order to determine whether I brought in any new failures. The failures can be linked to the failures in Daily runs and IMHO should be resolved separately (a big commit as this is asking for a merge hell).

michalvavrik · 2022-05-26T16:56:44Z

Please note I also updated PR description. There is other work on clean up that should be done in a separate PRs.

pjgg

Cosmetic changes

http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/TelemetryIT.java

http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResourceIT.java

...java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandlerIT.java

...ava/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamRouteHandlerIT.java

...st/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandlerIT.java

...ke-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/FallbackResourceIT.java

michalvavrik · 2022-05-27T08:51:56Z

@pjgg you're absolutely right, I reverted unnecessary changes. The feedback has been very much appreciated.

pjgg

LGTM

michalvavrik · 2022-05-27T09:35:39Z

Fixed typo, thnx

We should use latest Keycloak version. Upstream docs says `In Keycloak 17 the default distribution is now powered by Quarkus, while the legacy WildFly powered distribution will still be around until June 2022 we highly recommend starting the migration as soon as possible.` Using Keycloak 13.0.1 caused test failures of DevModeKeycloakDevServiceUserExperienceIT

Tracing operation name is registered as `/graphql` and but the test used operation name `graphql`, thus no tracing were found and the test failed.

pjgg · 2022-05-27T15:40:32Z

Kafka errors are not related to this PR.

rsvoboda · 2022-05-28T21:03:03Z

@michalvavrik just fyi:ChuckNorrisResourceIT changes for span name were trigger by quarkusio/quarkus#24017

michalvavrik · 2022-06-02T13:25:47Z

...vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/ChuckNorrisResourceIT.java

@@ -101,7 +101,7 @@ public void getTimeoutWhenResponseItsTooSlow() {
    @Test
    public void endpointShouldTrace() {
        final int pageLimit = 50;
-        final String expectedOperationName = "trace/ping";
+        final String expectedOperationName = "/trace/ping";


@pjgg this line can't be backported for only 2.8.0.CR1 + is affected.

michalvavrik requested a review from pjgg May 25, 2022 21:24

michalvavrik self-assigned this May 25, 2022

michalvavrik force-pushed the feature/package-names-part-one branch 2 times, most recently from f264296 to d560fc7 Compare May 26, 2022 07:12

pjgg suggested changes May 26, 2022

View reviewed changes

websockets/websockets-client/src/test/java/io/quarkus/websockets/client/WebSocketsClientIT.java Outdated Show resolved Hide resolved

...quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerIT.java Outdated Show resolved Hide resolved

michalvavrik force-pushed the feature/package-names-part-one branch from d560fc7 to d5191f6 Compare May 26, 2022 10:25

michalvavrik force-pushed the feature/package-names-part-one branch 2 times, most recently from d5705c8 to 34906ae Compare May 26, 2022 16:41

michalvavrik force-pushed the feature/package-names-part-one branch from 34906ae to c2a6aca Compare May 26, 2022 16:51

michalvavrik requested a review from pjgg May 26, 2022 16:53

michalvavrik changed the title ~~TS Clean-up - Move Sql & Websockets packages and rename tests~~ TS Clean-up - Move Classes and Rename Packages May 26, 2022

pjgg suggested changes May 27, 2022

View reviewed changes

michalvavrik force-pushed the feature/package-names-part-one branch from c2a6aca to 0a41e25 Compare May 27, 2022 08:48

michalvavrik requested a review from pjgg May 27, 2022 08:52

michalvavrik force-pushed the feature/package-names-part-one branch from 0a41e25 to 73e912e Compare May 27, 2022 09:30

pjgg approved these changes May 27, 2022

View reviewed changes

TS Cleanup - Rename Packages & Fix Jagger operation name

57b2c12

michalvavrik force-pushed the feature/package-names-part-one branch from 58d6620 to 57b2c12 Compare May 27, 2022 12:28

michalvavrik added 2 commits May 27, 2022 15:08

Start OpenTelemetry operation name with a slash for GraphQL endpoint

2495b93

Tracing operation name is registered as `/graphql` and but the test used operation name `graphql`, thus no tracing were found and the test failed.

pjgg merged commit 7b29d43 into quarkus-qe:main May 27, 2022

michalvavrik deleted the feature/package-names-part-one branch May 27, 2022 17:05

rsvoboda added the triage/backport-2.7? It needs to backport changes to branch 2.7 label May 31, 2022

michalvavrik commented Jun 2, 2022

View reviewed changes

pjgg added this to the 2.7 milestone Jun 6, 2022

pjgg added triage/backport-2.7? It needs to backport changes to branch 2.7 and removed triage/backport-2.7? It needs to backport changes to branch 2.7 labels Jun 6, 2022

pjgg mentioned this pull request Jun 6, 2022

[2.7] Bulk - Backport from upstream _1 #688

Merged

2 tasks

pjgg removed the triage/backport-2.7? It needs to backport changes to branch 2.7 label Jun 8, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TS Clean-up - Move Classes and Rename Packages #660

TS Clean-up - Move Classes and Rename Packages #660

michalvavrik commented May 25, 2022 •

edited

Loading

michalvavrik commented May 25, 2022

pjgg left a comment

michalvavrik commented May 26, 2022

michalvavrik commented May 26, 2022

michalvavrik commented May 26, 2022

michalvavrik commented May 26, 2022

pjgg left a comment

michalvavrik commented May 27, 2022 •

edited

Loading

pjgg left a comment

michalvavrik commented May 27, 2022

pjgg commented May 27, 2022

rsvoboda commented May 28, 2022

michalvavrik Jun 2, 2022

TS Clean-up - Move Classes and Rename Packages #660

TS Clean-up - Move Classes and Rename Packages #660

Conversation

michalvavrik commented May 25, 2022 • edited Loading

Summary

Checklist:

michalvavrik commented May 25, 2022

pjgg left a comment

Choose a reason for hiding this comment

michalvavrik commented May 26, 2022

michalvavrik commented May 26, 2022

michalvavrik commented May 26, 2022

michalvavrik commented May 26, 2022

pjgg left a comment

Choose a reason for hiding this comment

michalvavrik commented May 27, 2022 • edited Loading

pjgg left a comment

Choose a reason for hiding this comment

michalvavrik commented May 27, 2022

pjgg commented May 27, 2022

rsvoboda commented May 28, 2022

michalvavrik Jun 2, 2022

Choose a reason for hiding this comment

michalvavrik commented May 25, 2022 •

edited

Loading

michalvavrik commented May 27, 2022 •

edited

Loading